pull-request-67-LPS-39039