Merge pull request #4133 from FernetMenta/aefixes