Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Missing global metric

Change-Id: Ib05c3f40b41eee490b748b8c929f7192d1b5adfb