#MPS-19412 fix