Merge "Fix CA descriptor parsing"