Fixing for changes in background processing. Other changes are mostly from a merge.