Merge branch 'sql-install'