NEON-1148 Adding xdata logging