LPS-45249

Backport will be submit through BPR