Merge "Use P521 curve instead of P256" into sc-dev