Merge pull request #1625 from YosysHQ/eddie/abc9_mfs