Merge branch 'xa_branch'