Just adding the note, no review was actually done: changing the structure of a parsed header can impact cloning of the sip msg in transaction and how it is freed.
Then, on a quick look, it seems the patch for hfl has also conditions on p-asserted-identity and p-preferred-identity header types, not only on diversion, as the commit message says.