Merge upstream updates: fix ignsql