[[ Bug 13007 ]] Make sure native encoded menus don't incorrectly convert tag.
Merge branch 'bugfix-13007' into develop