MOX-1017: Rory

Owned by Gray