Merge branch 'stable-2.13' * stable-2.13: Deprecate plugin Change-Id: I4e6056122eef064f3bcadc93bf353657a675cd98