LPS-19107

Do __not__ back port to 6.1.x