Replace broken organization auth with latest code from master and fix _group_auth_check