Merge branch 'merge' into mhb

Change-Id: Ifc226ad6557eb2265acbb7a7e8835a37c40f2335