Index: src/wp-admin/includes/admin-filters.php
--- src/wp-admin/includes/admin-filters.php
+++ src/wp-admin/includes/admin-filters.php
@@ -15,51 +15,63 @@
 add_action( 'activity_box_end', 'wp_dashboard_quota' );
 
 // Media hooks.
-add_filter( 'media_upload_tabs', 'update_gallery_tab' );
-add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
+add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+
 add_action( 'media_buttons', 'media_buttons' );
 
-add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
-add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 );
+add_action( 'media_upload_image', 'wp_media_upload_handler' );
+add_action( 'media_upload_audio', 'wp_media_upload_handler' );
+add_action( 'media_upload_video', 'wp_media_upload_handler' );
+add_action( 'media_upload_file',  'wp_media_upload_handler' );
 
 add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
-add_action( 'post-html-upload-ui', 'media_upload_html_bypass' );
+
+add_action( 'post-html-upload-ui', 'media_upload_html_bypass'  );
+
 add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
 add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
 add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
 add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
 
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file',  'wp_media_upload_handler' );
+add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
 
+add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
+
+add_filter( 'media_send_to_editor',      'image_media_send_to_editor',      10, 3 );
+
 add_filter( 'media_upload_gallery', 'media_upload_gallery' );
 add_filter( 'media_upload_library', 'media_upload_library' );
 
-add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+add_filter( 'media_upload_tabs', 'update_gallery_tab' );
 
+
 // Misc hooks.
-add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 );
-add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
+add_action( 'admin_head', 'wp_admin_canonical_url'   );
 add_action( 'admin_head', 'wp_color_scheme_settings' );
-add_action( 'admin_head', '_ipad_meta' );
-add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10, 3 );
-add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
-// Run later as we have to set DOING_AUTOSAVE for back-compat
-add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
+add_action( 'admin_head', '_ipad_meta'               );
+
 add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' );
-add_action( 'admin_head', 'wp_admin_canonical_url' );
 
+add_action( 'update_option_home',          'update_home_siteurl', 10, 2 );
+add_action( 'update_option_siteurl',       'update_home_siteurl', 10, 2 );
+add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
+
+add_filter( 'heartbeat_received', 'wp_check_locked_posts',  10,  3 );
+add_filter( 'heartbeat_received', 'wp_refresh_post_lock',   10,  3 );
+add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10,  3 );
+add_filter( 'heartbeat_received', 'heartbeat_autosave',     500, 2 );
+
+add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
+
+
 // Nav Menu hooks.
 add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
 
+
 // Plugin hooks.
 add_filter( 'whitelist_options', 'option_update_filter' );
 
+
 // Plugin Install hooks.
 add_action( 'install_plugins_featured',               'install_dashboard' );
 add_action( 'install_plugins_upload',                 'install_plugins_upload' );
@@ -71,13 +83,16 @@
 add_action( 'install_plugins_favorites',              'display_plugins_table' );
 add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
 
+
 // Template hooks.
 add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts'                ) );
 add_action( 'user_register',         array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
 
+
 // Theme hooks.
 add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
 
+
 // Theme Install hooks.
 // add_action('install_themes_dashboard', 'install_themes_dashboard');
 // add_action('install_themes_upload', 'install_themes_upload', 10, 0);
@@ -87,22 +102,28 @@
 // add_action('install_themes_updated', 'display_themes');
 add_action( 'install_themes_pre_theme-information', 'install_theme_information' );
 
+
 // User hooks.
 add_action( 'admin_init', 'default_password_nag_handler' );
-add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
+
 add_action( 'admin_notices', 'default_password_nag' );
 
+add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
+
+
 // Update hooks.
-add_filter( 'update_footer', 'core_update_footer' );
-add_action( 'admin_notices', 'update_nag', 3 );
-add_action( 'network_admin_notices', 'update_nag', 3 );
 add_action( 'admin_init', 'wp_plugin_update_rows' );
-add_action( 'admin_init', 'wp_theme_update_rows' );
-add_action( 'admin_notices', 'maintenance_nag' );
-add_action( 'network_admin_notices', 'maintenance_nag' );
+add_action( 'admin_init', 'wp_theme_update_rows'  );
 
+add_action( 'admin_notices', 'update_nag',      3  );
+add_action( 'admin_notices', 'maintenance_nag', 10 );
+
+add_filter( 'update_footer', 'core_update_footer' );
+
+
 // Update Core hooks.
 add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
 
+
 // Upgrade hooks.
 add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
Index: src/wp-admin/includes/ms-admin-filters.php
--- src/wp-admin/includes/ms-admin-filters.php
+++ src/wp-admin/includes/ms-admin-filters.php
@@ -7,24 +7,42 @@
  * @since 4.3.0
  */
 
+// Media Hooks.
 add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
 
-add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
+// User Hooks
+add_action( 'admin_notices', 'new_user_email_admin_notice' );
+
+add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
+
 add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
 
 add_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
 
-add_action( 'admin_notices', 'new_user_email_admin_notice' );
+add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
 
+
+// Site Hooks.
 add_action( 'wpmueditblogaction', 'upload_space_setting' );
 
+
+// Taxonomy Hooks
 add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
 
-add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
 
+// Post Hooks.
+add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 );
+
+
+// Tools Hooks.
 add_filter( 'import_allow_create_users', 'check_import_new_users' );
 
-add_action( 'admin_notices', 'site_admin_notice' );
+
+// Notices Hooks
+add_action( 'admin_notices',         'site_admin_notice' );
 add_action( 'network_admin_notices', 'site_admin_notice' );
 
-add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 );
+
+// Update Hooks
+add_action( 'network_admin_notices', 'update_nag',      3  );
+add_action( 'network_admin_notices', 'maintenance_nag', 10 );