misc: Merge branch 'stable' into develop

Change-Id: I5e2774bc06bb380f8ffe48cf16323aa6dd9f52e4