Merge pull request #4812 from FernetMenta/aefixes