Updates for changes concurrent with this branch.