LPS-45163

LPS-45163 Rebased