back-porting fix for MPS-18718