Synchronize upstream changes with new code base.