Merge branch 'stable-2.16' into 'stable-3.0'

* stable-2.16:
  Polygerrit UI

Change-Id: Ieb92f98d48df99c14912a9d01b8fa7b69f61e496