LPS-49103

master only