LPS-48718

master