Base fixes for 3.8.1 to support DeltaStreams. Packaged as a ChangeSet so that it can make any changes it needs.