ML-2546: Lupin

Owned by Shenzu