MAGII-1808: leroy

Owned by bluejam