Last merge before SQL project diverged.