LPS-41844

This is not critical. No need for priority backport