Fix Endpoint ACL issue #2054