Fix MPS-18806 [build:IC-129.961] null
Merge branch 'MPS3.0'