Merge pull request #4063 from oliverguenther/fix/user_toolbar
[22454] Fix improperly escaped toolbarspull/4069/head
commit
1731ebf4f6
[22454] Fix improperly escaped toolbarspull/4069/head