Merge "Add XSQL into default compilation"