LPS-42235

For master