Merge sql_server branch into jdbcpostgresql branch