LPS-44135

master only