Upgraded merged in code.
Continued fixing unit test failures.