Merge branch 'stable-2.13'

* stable-2.13:
  Deprecate plugin

Change-Id: I7ef8248e455c44eaa8c461b5134a9e1d7e963a26