Merge pull request #2082 from YosysHQ/eddie/abc9_scc_fixes