LPS-45890

For master only