got MC refactored to use deferred instantiation
Merge branch 'refactoringMadComponentsNav'