Merge pull request #2737 from YosysHQ/claire/fix2736