Merge #23 (AES security plugin support)