LPS-41845

This is not critical. No need for priority backport