Merge "Limit the number of supported v1 and v2 signers" into rvc-dev