diff --git bp-core/admin/bp-core-components.php bp-core/admin/bp-core-components.php
index bca1c39..c5343b4 100644
--- bp-core/admin/bp-core-components.php
+++ bp-core/admin/bp-core-components.php
@@ -358,7 +358,7 @@ function bp_core_admin_get_components( $type = 'all' ) {
 	);
 
 	// Optional core components
-	$optional_components = array(
+	$optional_components = apply_filters( 'bp_core_admin_get_optional_components', array(
 		'xprofile' => array(
 			'title'       => __( 'Extended Profiles', 'buddypress' ),
 			'description' => __( 'Customize your community with fully editable profile fields that allow your users to describe themselves.', 'buddypress' )
@@ -395,7 +395,7 @@ function bp_core_admin_get_components( $type = 'all' ) {
 			'title'       => __( 'Site Tracking', 'buddypress' ),
 			'description' => __( 'Record activity for new posts and comments from your site.', 'buddypress' )
 		)
-	);
+	) );
 
 
 	// Add blogs tracking if multisite
diff --git bp-core/admin/css/common.css bp-core/admin/css/common.css
index 17548ec..402e3eb 100644
--- bp-core/admin/css/common.css
+++ bp-core/admin/css/common.css
@@ -222,6 +222,10 @@ body.branch-3-7 #adminmenu li.toplevel_page_bp-general-settings .wp-menu-image {
 	content: "\f454";
 }
 
+.settings_page_bp-components tr.attachments td.plugin-title span:before {
+	content: "\f128";
+}
+
 /* Settings - Legacy (< WP 3.8) */
 body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span:before,
 body.branch-3-6.settings_page_bp-components tr.notifications td.plugin-title span:before,
diff --git bp-core/bp-core-avatars.php bp-core/bp-core-avatars.php
index a6e638f..d7f6074 100644
--- bp-core/bp-core-avatars.php
+++ bp-core/bp-core-avatars.php
@@ -764,7 +764,7 @@ function bp_core_avatar_handle_crop( $args = '' ) {
 		$new_avatar_path      = str_replace( $upload_dir['basedir'], '', $original_file );
 
 		if ( $existing_avatar_path !== $new_avatar_path ) {
-			bp_core_delete_existing_avatar( array( 'object' => $object, 'avatar_path' => $avatar_folder_dir ) );
+			bp_core_delete_existing_avatar( array( 'object' => $object, 'item_id' => $item_id,'avatar_path' => $avatar_folder_dir ) );
 		}
 	}
 
diff --git bp-core/bp-core-caps.php bp-core/bp-core-caps.php
index 2ed693d..1f3defb 100644
--- bp-core/bp-core-caps.php
+++ bp-core/bp-core-caps.php
@@ -191,7 +191,10 @@ function bp_current_user_can( $capability, $blog_id = 0 ) {
 	if ( empty( $blog_id ) )
 		$blog_id = bp_get_root_blog_id();
 
-	$retval = current_user_can_for_blog( $blog_id, $capability );
+	$args = array_slice( func_get_args(), 2 );
+	$args = array_merge( array( $blog_id, $capability ), $args );
+
+	$retval = call_user_func_array( 'current_user_can_for_blog', $args );
 
 	return (bool) apply_filters( 'bp_current_user_can', $retval, $capability, $blog_id );
 }
diff --git bp-core/bp-core-loader.php bp-core/bp-core-loader.php
index 7dd0f51..e99db91 100644
--- bp-core/bp-core-loader.php
+++ bp-core/bp-core-loader.php
@@ -108,6 +108,8 @@ class BP_Core extends BP_Component {
 			}
 		}
 
+		do_action( 'bp_core_components_included', $bp->active_components );
+
 		// Add Core to required components
 		$bp->required_components[] = 'core';
 	}