Merge changes to SQL from dev to master