Merged SQL reduction and VSC related changes.