LPS-48581 Fix bad merge for 6.2.x