Add Entonnoir Latest

Closes #7424.
Merge pull request #7431 from vitorgalvao/fix-7424

Add Entonnoir Latest