MPS-20967 Merge loosing changes