Merge into jb-mr1-dev

Change-Id: I6bfc2726c0c259eeb3caf13e1cee395324cac4c3