Required for Windows deterministic build
Merge branch 'master' into testnet