ML-4461: Rory

Owned by Inkdrip