Optimize tests for ACL rules
Merge branch 'master' into router-ui