Merge "Added feature for sal-mdsal-xsql"