Stable: More work on SQL consolidation