Merge to master + SQL Uniformity