Port access control to new framework
Merge pull request #738 from psav/akarol-accesscontrol

Port access control to new framework