Merge pull request #4413 from FernetMenta/aefixes