pull-request-51-LPS-34218