Merge pull request #4619 from fritsch/aefixes