LPS-50167

master only