aether

Closes #6776.
Merge pull request #6781 from vitorgalvao/fix-6776

aether