Merge into jb-mr1-dev

Change-Id: I65f9c552cf0ef2792df64c907f0a56913e6c6f30