fixing of the issue. test not done yet
Merge branch '74201686' into AccessControl