LPS-40389

7.0.x