SOS-1605

This commit requires LPS-36184