Merge into jb-mr1-dev

Change-Id: I6504b000be7e3b6e770af99c5a922fd1e9ec73de