pull-request-40-LPS-35264