LPS-41407

For master