LPS-41604

For master. Please backport to release branch for 6.2