Updated to fix xyz issues.
Merge branch 'hotfix/fix_issue_with_xyz'