NXP-13424: Cleanup
NXP-13424: Add flag to know if a hierarchy is fully loaded or not