Merge branch 'add-admin-and-moderator-fields' into 'develop'