LPS-47443 fix for QTZ-413