Merge pull request #1831 from boqwxp/cleanup_sat_eval