SB-2217: Rory

Owned by Werge