Merged update certificate verification for EC certificates into
development