LPS-42219 Fix based on Back Port of LPS-41631.