Merge branch '3840_menu_quoting'