Performance Problem Editor/Type System, MPS-19802
Merge remote-tracking branch 'origin/MPS3.1'