Inv gen merge

Preparing for support of condact in upward instantiation of terms in subsystems.