Merge pull request #3456 from AndrzejKurek/aes-fi-improvements

Minor AES module improvements