updated to add additional fixes for xyz.
Merge branch 'hotfix/fix_issue_with_xyz' into develop