LPS-45117

master only