LPS-46025

Resolves regression caused by LPS-28331 and maintains the fix of LPS-28331.