LPS-41414

For master