diff --git a/wp-includes/option.php b/wp-includes/option.php
index 5749f8b..3a0dc0d 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -980,14 +980,19 @@ function delete_all_user_settings() {
  *
  * @global wpdb $wpdb
  *
- * @param string $option    Name of option to retrieve. Expected to not be SQL-escaped.
- * @param mixed  $default   Optional value to return if option doesn't exist. Default false.
- * @param bool   $use_cache Whether to use cache. Multisite only. Default true.
+ * @param string     $option      Name of option to retrieve. Expected to not be SQL-escaped.
+ * @param mixed      $default     Optional value to return if option doesn't exist. Default false.
+ * @param bool       $use_cache   Whether to use cache. Multisite only. Default true.
+ * @param bool|int   $network_id  The ID of the network for the option to retrieve. Multisite only. Default false.
  * @return mixed Value set for the option.
  */
-function get_site_option( $option, $default = false, $use_cache = true ) {
+function get_site_option( $option, $default = false, $use_cache = true, $network_id = false ) {
 	global $wpdb;
 
+	if( ! $network_id  ){
+		$network_id = $wpdb->siteid;
+	}
+
 	/**
 	 * Filter an existing site option before it is retrieved.
 	 *
@@ -999,17 +1004,18 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
 	 * @since 2.9.0 As 'pre_site_option_' . $key
 	 * @since 3.0.0
 	 * @since 4.4.0 The `$option` parameter was added
+	 * @since 4.4.0 The `$network_id` parameter was added
 	 *
 	 * @param mixed  $pre_option The default value to return if the option does not exist.
 	 * @param string $option     Option name.
 	 */
-	$pre = apply_filters( 'pre_site_option_' . $option, false, $option );
+	$pre = apply_filters( 'pre_site_option_' . $option, false, $option, $network_id );
 
  	if ( false !== $pre )
  		return $pre;
 
 	// prevent non-existent options from triggering multiple queries
-	$notoptions_key = "{$wpdb->siteid}:notoptions";
+	$notoptions_key = "{$network_id}:notoptions";
 	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
 
 	if ( isset( $notoptions[$option] ) ) {
@@ -1021,26 +1027,27 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
 		 *
 		 * @since 3.4.0
 		 * @since 4.4.0 The `$option` parameter was added.
+		 * @since 4.4.0 The `$network_id` parameter was added
 		 *
 		 * @param mixed  $default The value to return if the site option does not exist
 		 *                        in the database.
 		 * @param string $option  Option name.
 		 */
-		return apply_filters( 'default_site_option_' . $option, $default, $option );
+		return apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
 	}
 
 	if ( ! is_multisite() ) {
 
 		/** This filter is documented in wp-includes/option.php */
-		$default = apply_filters( 'default_site_option_' . $option, $default, $option );
+		$default = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
 		$value = get_option($option, $default);
 	} else {
-		$cache_key = "{$wpdb->siteid}:$option";
+		$cache_key = "{$network_id}:$option";
 		if ( $use_cache )
 			$value = wp_cache_get($cache_key, 'site-options');
 
 		if ( !isset($value) || (false === $value) ) {
-			$row = $wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
+			$row = $wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
 
 			// Has to be get_row instead of get_var because of funkiness with 0, false, null values
 			if ( is_object( $row ) ) {
@@ -1055,7 +1062,7 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
 				wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
 
 				/** This filter is documented in wp-includes/option.php */
-				$value = apply_filters( 'default_site_option_' . $option, $default, $option );
+				$value = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
 			}
 		}
 	}
@@ -1068,11 +1075,12 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
 	 * @since 2.9.0 As 'site_option_' . $key
 	 * @since 3.0.0
 	 * @since 4.4.0 The `$option` parameter was added
+	 * @since 4.4.0 The `$network_id` parameter was added
 	 *
 	 * @param mixed  $value  Value of site option.
 	 * @param string $option Option name.
 	 */
-	return apply_filters( 'site_option_' . $option, $value, $option );
+	return apply_filters( 'site_option_' . $option, $value, $option, $network_id );
 }
 
 /**
@@ -1086,15 +1094,20 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
  *
  * @global wpdb $wpdb
  *
- * @param string $option Name of option to add. Expected to not be SQL-escaped.
- * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
+ * @param string     $option Name of option to add. Expected to not be SQL-escaped.
+ * @param mixed      $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
+ * @param bool|int   $network_id  The ID of the network for the option to retrieve. Multisite only. Default false.
  * @return bool False if option was not added and true if option was added.
  */
-function add_site_option( $option, $value ) {
+function add_site_option( $option, $value, $network_id = false ) {
 	global $wpdb;
 
 	wp_protect_special_option( $option );
 
+	if( ! $network_id  ){
+		$network_id = $wpdb->siteid;
+	}
+
 	/**
 	 * Filter the value of a specific site option before it is added.
 	 *
@@ -1103,29 +1116,30 @@ function add_site_option( $option, $value ) {
 	 * @since 2.9.0 As 'pre_add_site_option_' . $key
 	 * @since 3.0.0
 	 * @since 4.4.0 The `$option` parameter was added
+	 * @since 4.4.0 The `$network_id` parameter was added
 	 *
 	 * @param mixed  $value  Value of site option.
 	 * @param string $option Option name.
 	 */
-	$value = apply_filters( 'pre_add_site_option_' . $option, $value, $option );
+	$value = apply_filters( 'pre_add_site_option_' . $option, $value, $option, $network_id );
 
-	$notoptions_key = "{$wpdb->siteid}:notoptions";
+	$notoptions_key = "{$network_id}:notoptions";
 
 	if ( !is_multisite() ) {
 		$result = add_option( $option, $value );
 	} else {
-		$cache_key = "{$wpdb->siteid}:$option";
+		$cache_key = "{$network_id}:$option";
 
 		// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
 		$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
 		if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) )
-			if ( false !== get_site_option( $option ) )
+			if ( false !== get_site_option( $option, false, true, $network_id ) )
 				return false;
 
 		$value = sanitize_option( $option, $value );
 
 		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $serialized_value ) );
+		$result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $network_id, 'meta_key' => $option, 'meta_value' => $serialized_value ) );
 
 		if ( ! $result )
 			return false;
@@ -1149,21 +1163,24 @@ function add_site_option( $option, $value ) {
 		 *
 		 * @since 2.9.0 As "add_site_option_{$key}"
 		 * @since 3.0.0
+		 * @since 4.4.0 The `$network_id` parameter was added
 		 *
 		 * @param string $option Name of site option.
 		 * @param mixed  $value  Value of site option.
+		 *
 		 */
-		do_action( "add_site_option_{$option}", $option, $value );
+		do_action( "add_site_option_{$option}", $option, $value, $network_id );
 
 		/**
 		 * Fires after a site option has been successfully added.
 		 *
 		 * @since 3.0.0
+		 * @since 4.4.0 The `$network_id` parameter was added
 		 *
 		 * @param string $option Name of site option.
 		 * @param mixed  $value  Value of site option.
 		 */
-		do_action( "add_site_option", $option, $value );
+		do_action( "add_site_option", $option, $value, $network_id );
 
 		return true;
 	}
@@ -1180,13 +1197,18 @@ function add_site_option( $option, $value ) {
  * @global wpdb $wpdb
  *
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
+ * @param bool|int   $network_id  The ID of the network for the option to retrieve. Multisite only. Default false.
  * @return bool True, if succeed. False, if failure.
  */
-function delete_site_option( $option ) {
+function delete_site_option( $option, $network_id = false ) {
 	global $wpdb;
 
 	// ms_protect_special_option( $option ); @todo
 
+	if( ! $network_id  ){
+		$network_id = $wpdb->siteid;
+	}
+
 	/**
 	 * Fires immediately before a specific site option is deleted.
 	 *
@@ -1194,21 +1216,22 @@ function delete_site_option( $option ) {
 	 *
 	 * @since 3.0.0
 	 * @since 4.4.0 The `$option` parameter was added
+	 * @since 4.4.0 The `$network_id` parameter was added
 	 *
 	 * @param string $option Option name.
 	 */
-	do_action( 'pre_delete_site_option_' . $option, $option );
+	do_action( 'pre_delete_site_option_' . $option, $option, $network_id );
 
 	if ( !is_multisite() ) {
 		$result = delete_option( $option );
 	} else {
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
+		$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
 		if ( is_null( $row ) || !$row->meta_id )
 			return false;
-		$cache_key = "{$wpdb->siteid}:$option";
+		$cache_key = "{$network_id}:$option";
 		wp_cache_delete( $cache_key, 'site-options' );
 
-		$result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $wpdb->siteid ) );
+		$result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $network_id ) );
 	}
 
 	if ( $result ) {
@@ -1220,19 +1243,21 @@ function delete_site_option( $option ) {
 		 *
 		 * @since 2.9.0 As "delete_site_option_{$key}"
 		 * @since 3.0.0
+		 * @since 4.4.0 The `$network_id` parameter was added
 		 *
 		 * @param string $option Name of the site option.
 		 */
-		do_action( "delete_site_option_{$option}", $option );
+		do_action( "delete_site_option_{$option}", $option, $network_id );
 
 		/**
 		 * Fires after a site option has been deleted.
 		 *
 		 * @since 3.0.0
+		 * @since 4.4.0 The `$network_id` parameter was added
 		 *
 		 * @param string $option Name of the site option.
 		 */
-		do_action( "delete_site_option", $option );
+		do_action( "delete_site_option", $option, $network_id );
 
 		return true;
 	}
@@ -1250,14 +1275,19 @@ function delete_site_option( $option ) {
  *
  * @param string $option Name of option. Expected to not be SQL-escaped.
  * @param mixed  $value  Option value. Expected to not be SQL-escaped.
+ * @param bool|int   $network_id  The ID of the network for the option to retrieve. Multisite only. Default false.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_site_option( $option, $value ) {
+function update_site_option( $option, $value, $network_id = false ) {
 	global $wpdb;
 
 	wp_protect_special_option( $option );
 
-	$old_value = get_site_option( $option );
+	if( ! $network_id  ){
+		$network_id = $wpdb->siteid;
+	}
+
+	$old_value = get_site_option( $option, false, true, $network_id );
 
 	/**
 	 * Filter a specific site option before its value is updated.
@@ -1267,20 +1297,21 @@ function update_site_option( $option, $value ) {
 	 * @since 2.9.0 As 'pre_update_site_option_' . $key
 	 * @since 3.0.0
 	 * @since 4.4.0 The `$option` parameter was added
+	 * @since 4.4.0 The `$network_id` parameter was added
 	 *
 	 * @param mixed  $value     New value of site option.
 	 * @param mixed  $old_value Old value of site option.
 	 * @param string $option    Option name.
 	 */
-	$value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value, $option );
+	$value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value, $option, $network_id );
 
 	if ( $value === $old_value )
 		return false;
 
 	if ( false === $old_value )
-		return add_site_option( $option, $value );
+		return add_site_option( $option, $value, $network_id );
 
-	$notoptions_key = "{$wpdb->siteid}:notoptions";
+	$notoptions_key = "{$network_id}:notoptions";
 	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
 	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
 		unset( $notoptions[$option] );
@@ -1293,10 +1324,10 @@ function update_site_option( $option, $value ) {
 		$value = sanitize_option( $option, $value );
 
 		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) );
+		$result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $network_id, 'meta_key' => $option ) );
 
 		if ( $result ) {
-			$cache_key = "{$wpdb->siteid}:$option";
+			$cache_key = "{$network_id}:$option";
 			wp_cache_set( $cache_key, $value, 'site-options' );
 		}
 	}
@@ -1310,23 +1341,25 @@ function update_site_option( $option, $value ) {
 		 *
 		 * @since 2.9.0 As "update_site_option_{$key}"
 		 * @since 3.0.0
+		 * @since 4.4.0 The `$network_id` parameter was added
 		 *
 		 * @param string $option    Name of site option.
 		 * @param mixed  $value     Current value of site option.
 		 * @param mixed  $old_value Old value of site option.
 		 */
-		do_action( "update_site_option_{$option}", $option, $value, $old_value );
+		do_action( "update_site_option_{$option}", $option, $value, $old_value, $network_id );
 
 		/**
 		 * Fires after the value of a site option has been successfully updated.
 		 *
 		 * @since 3.0.0
+		 * @since 4.4.0 The `$network_id` parameter was added
 		 *
 		 * @param string $option    Name of site option.
 		 * @param mixed  $value     Current value of site option.
 		 * @param mixed  $old_value Old value of site option.
 		 */
-		do_action( "update_site_option", $option, $value, $old_value );
+		do_action( "update_site_option", $option, $value, $old_value, $network_id );
 
 		return true;
 	}