LPS-28313

for peer review