Fixes #17681 - Switch to newly created taxonomy
(cherry picked from commit 9f68d4d91af0eef381a97dd5c4b33c114282d4e2)
Fixes #17681 - Switch to newly created taxonomy
(cherry picked from commit 9f68d4d91af0eef381a97dd5c4b33c114282d4e2)