MPS-17379 Exception while merging
Merge branch 'mvtest30'
TODO
fix diff test