Merge "Fix xsql compilation failure"