[IFT] fixes by IDEA-CR-67893