LPS-47517 apply Ray's changes