LPS-44852

Master only.