Haikki

Taxonomy upgrade extras: