LPS-41895

Please include in 6.2