SQL for 6.0.0 upgrade
Merge remote-tracking branch 'origin/develop' into develop