Merge "Ignore INVALID tags in generated key characteristics." into main