Final unit tests for merge, including stranded merge bug fixes.
Merge branch 'merge'