Merge into jb-mr1-dev

Change-Id: Idf183be6a41ff37add5141a20e96d5190396d1a4