Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Add a 'banner' extension point

Change-Id: I7c72829830a5bf1063b1376fb3f419437428925d