LPS-42507

For master