Merge branch '3409_user_menu_help'