Merge in changes from hotfix branch.