LPS-40914

pull-request-51-LPS-40914