Merge pull request #2093 from boqwxp/qbfsat-bugfixes