Merge updates from source repo into "old" 2.1.0 branch.