Merge branch 'stable-3.3'

* stable-3.3:
  Missing global metric

Change-Id: I0eed5d776675ea7409657d1e5082019d0f48b8e9