Merge "Remove a redundant KeyPairsV3ClientJSON"