pull-request-42-LPS-36540