Merge "Fix bug bug 2651 - XSQL does not pickup augmentation data "