LPS-31854

Hey Igor, can you verify this change. After merging @shinnlok 's change, it seems that it eliminated the need for LPS-31929.