pull-request-54-LPS-37650