MSM7x27 merge 'Part 2'