Merge into jb-mr1-dev

Change-Id: I1baab28b12364213673ed7992207ad198491f286