Check in changes over the last few months

There are a number of changes included in this checkin.