decom: ms6

RT #7237

Change-Id: I3f57b6d7fe78b93de1aee6372626790f421fca96
Merge "decom: ms6" into production