Fix for almost infinite loop in "Insert intermediate Corners " code
Speed up evaluation of instance uri expression
fix for models with different scalings creating new Instance nodes
Merge branch 'topic-substitute_model_optimizations' into UpstreamTest