Merge into jb-mr1-dev

Change-Id: Iec56e4962bbc78309b20595352cce986fe62f68e