JFb259

Taxonomy upgrade extras: