Make RolledBy required
Merged changes