Merging sql updates

Merging to master for publication of sql management package 0.9.13-prerelease