Merge pull request #2907 from fritsch/ae-remove-warning