Merge branch 'change-access-update' into 'master'

Change the order of the access rules to check simpler first, and add specs

See merge request !5799