changed and fixed XYZ name
Merge remote-tracking branch 'origin/bug/CDB-1076' into release/2.5.4