LPS-50002

Master only.