- Patch #33747 by Ber and Moshe: bugfix + code improvement: clean up some of the taxonomy loading code.