MPS-18841 Red text in Diff window
Merge branch '3.0/mikev/test' into MPS3.0
make
Merge branch 'MPS3.0'