[Fixes #68718626] This makes trade_names resolve to their accepted/hybrid name.
Merge branch 'hotfix_0.6.8' into develop