Merge "Merge branch 'merge' into mhb"