diff --git a/src/_data/catalog/destination_categories.yml b/src/_data/catalog/destination_categories.yml
index 47e5e6ff2d..89d7b8d616 100644
--- a/src/_data/catalog/destination_categories.yml
+++ b/src/_data/catalog/destination_categories.yml
@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# destination categories last updated 2021-06-22 
+# destination categories last updated 2021-06-23 
 items:
 - display_name: Email Marketing
   slug: email-marketing
diff --git a/src/_data/catalog/destinations.yml b/src/_data/catalog/destinations.yml
index 077866709c..3625c1b0bc 100644
--- a/src/_data/catalog/destinations.yml
+++ b/src/_data/catalog/destinations.yml
@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# destination data last updated 2021-06-22 
+# destination data last updated 2021-06-23 
 items:
 - display_name: ActiveCampaign
   slug: activecampaign
diff --git a/src/_data/catalog/source_categories.yml b/src/_data/catalog/source_categories.yml
index db42e051cb..1198bbf067 100644
--- a/src/_data/catalog/source_categories.yml
+++ b/src/_data/catalog/source_categories.yml
@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# source cateogries last updated 2021-06-22 
+# source cateogries last updated 2021-06-23 
 items:
   - display_name: Server
     slug: server
diff --git a/src/_data/catalog/sources.yml b/src/_data/catalog/sources.yml
index 61ab6359be..8bb5f37603 100644
--- a/src/_data/catalog/sources.yml
+++ b/src/_data/catalog/sources.yml
@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# sources last updated 2021-06-22 
+# sources last updated 2021-06-23 
 items:
   - display_name: .NET
     slug: net
diff --git a/src/connections/destinations/catalog/google-analytics/index.md b/src/connections/destinations/catalog/google-analytics/index.md
index f8ca5cc77d..5bab09241f 100644
--- a/src/connections/destinations/catalog/google-analytics/index.md
+++ b/src/connections/destinations/catalog/google-analytics/index.md
@@ -120,9 +120,12 @@ On Google:
 
 You can only map each trait or property to one Custom Dimension at a time.
 
-When you finish mapping your dimensions and save the settings, Segment checks if the user traits and properties in [Identify](/docs/connections/spec/identify/), [Track](/docs/connections/spec/track/) and [Page](/docs/connections/spec/page/) calls are defined as a dimension. If they are defined in your mapping, Segment sends that dimension to Google Analytics.
+When you finish mapping dimensions and save the settings, Segment checks if the user traits and properties in [Identify](/docs/connections/spec/identify/), [Track](/docs/connections/spec/track/) and [Page](/docs/connections/spec/page/) calls are defined as a dimension. If they are defined in your mapping, Segment sends that dimension to Google Analytics.
 
-**Note:** Traits in [Identify calls](/docs/connections/spec/identify) that map to Custom Dimensions are only recorded to Google Analytics when the next [Track call](/docs/connections/spec/track) or [Page call](/docs/connections/spec/page) is fired from the browser.
+In the server-side integration, you can opt-in to mapping top-level and `context` object fields to dimensions and metrics using the **Enable Mappings from Top-Level or Context Fields - Server Side Only** setting. If this setting is enabled, top-level and `context` object fields defined in the **Custom Dimensions** mapping and found in [Identify](/docs/connections/spec/identify/), [Track](/docs/connections/spec/track/), [Page](/docs/connections/spec/page/) and [Screen](/docs/connections/spec/screen) calls are sent to Google Analytics.
+
+> info ""
+> Traits in [Identify calls](/docs/connections/spec/identify) that map to Custom Dimensions are only recorded to Google Analytics when the next [Track call](/docs/connections/spec/track) or [Page call](/docs/connections/spec/page) is fired from the browser.
 
 Continuing the example above, we can set the **Gender** trait with the value of **Male**, which maps to `dimension9`, and it will be passed to Google Analytics _when we make the 'Viewed History' Track call_.