Bring these changes over from the branch.