missed one
Merge branch 'obj_has_perm' into hyperdev