Tk3 1170 Pikku-Jumbo

Taxonomy upgrade extras: