LPS-48703

Master only