RGB-17

Taxonomy upgrade extras: