JOJ16: is restricted to admin flag added and tests fixed
Merge remote-tracking branch 'remotes/origin/joj16'