Merge into jb-mr1-dev

Change-Id: I7b777c7a4818d699582419d2eb4fc1f5cc0f4f46