LPS-39469

Do not back port to 6.1