Merge 3742983d from jb-dev

Change-Id: I6a9d140fdfac55fd0ada1c9c7e3b1d1a7cb8d8c9