Merge current work back to tree to minimize diffs and drift. Major highlights