Merge branch '731-admin-circ-rules' into 'master'