Merge pull request #6530 from yanesca/bignum_merge_scaffolding

Bignum merge scaffolding