BS 18.8.

Taxonomy upgrade extras: