Merge into jb-mr1-dev

Change-Id: Id8bbccaa542bef3351958fb6749370880a1921f3