Merge into jb-mr1-dev

Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5