LPS-30138 rebased