quick fix of the bug
fixing tests
Merge branch '75501054' into AccessControl