[WIP] A couple more commits on top of Matt and Christians msmbuilder2.8 work