Eloquent Refactor: Navigation #2330
Merge pull request #2495 from obrignoni/2.3/eloquent-refactor-navigation

Eloquent Refactor: Navigation #2330