LPP-9664

Master only.