Index: bp-core/admin/bp-core-components.php
===================================================================
--- bp-core/admin/bp-core-components.php	(revision 8154)
+++ bp-core/admin/bp-core-components.php	(working copy)
@@ -358,7 +358,7 @@
 	);
 
 	// 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 @@
 			'title'       => __( 'Site Tracking', 'buddypress' ),
 			'description' => __( 'Record activity for new posts and comments from your site.', 'buddypress' )
 		)
-	);
+	) );
 
 
 	// Add blogs tracking if multisite
Index: bp-core/bp-core-avatars.php
===================================================================
--- bp-core/bp-core-avatars.php	(revision 8154)
+++ bp-core/bp-core-avatars.php	(working copy)
@@ -764,7 +764,7 @@
 		$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 ) );
 		}
 	}
 
Index: bp-core/bp-core-loader.php
===================================================================
--- bp-core/bp-core-loader.php	(revision 8154)
+++ bp-core/bp-core-loader.php	(working copy)
@@ -108,6 +108,8 @@
 			}
 		}
 
+		do_action( 'bp_core_components_included', $bp->active_components );
+
 		// Add Core to required components
 		$bp->required_components[] = 'core';
 	}