LPS-51323

master only