Merge changes from join-up branch.