Porting back fix for MBL-10452.