pull-request-149

LPS-34103 Ready and working