Merge upstream to fix contract verification

[weilbith]

We reported an issue to the upstream that sometimes the contract verification does not work correctly. This is stated to be solved and merged to master.