Merge branch '2947_quoting_in_user_menu'