BS 23.08

Taxonomy upgrade extras: