Refactoring/simplification/testing of ACL-related functions/frames
Merge branch 'master' into acl_graph