Two bugfixes (using the non-conditional TSet_internal and addint useTSet in the constrainedby modifications)
Merge remote-tracking branch 'upstream/issue45BoilerModel' into issue45BoilerModel