Merge pull request #2552 from YosysHQ/claire/yosyshq