NEON-1149 Adding xdata logging