LPS-41002 rebased