Merge pull request #3824 from FernetMenta/aefixes