Fixed access controller handler
Merge branch 'handler' into np8