LPS-41604

Please backport to release branch for 6.2