Merge "Small fix to xsql dependencies"