LPS-39037 This should not be backported (reverse-merged from commit 37c5c001717ceb8d383c22f12df102b249766206)