Merge branch 'xerces-rename' into release