diff --git a/README.md b/README.md
index 5bfcc1c2ba..698413c0ad 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 **Requires at least:** 4.4  
 **Tested up to:** 5.2.2  
 **WC requires at least:** 3.0  
-**WC tested up to:** 3.6.5  
+**WC tested up to:** 3.7.0  
 **Requires PHP:** 5.6  
 **Stable tag:** trunk  
 **License:** GPLv2 or later  
@@ -284,6 +284,14 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+v2.9.20 -> August 23, 2019
+------------------------------------
+-   **Fix***   Geolocation map settings value is not saving
+-   **Fix***   Fix warning in vendor dashboard widget when seller setup wizard is not run
+-   **Fix***   Store banner height in vendor settings page it not honouring the saved settings
+-   **Fix***   Conflict with avada theme fution builder
+-   **Tweak*** Use WordPress backend date format while printing date in approved and cancelled withdraw request
+
 v2.9.19 -> July 29, 2019
 ------------------------------------
 -   **Fix***    Split orders created from admin dashboard
diff --git a/assets/js/vue-admin.js b/assets/js/vue-admin.js
index d00fc5cd0f..58b241e4b1 100644
--- a/assets/js/vue-admin.js
+++ b/assets/js/vue-admin.js
@@ -2536,8 +2536,8 @@ let Gmap = dokan_get_lib('Gmap');
         getGmapApiKey() {
             let settings = this.allSettingsValues;
 
-            if ('dokan_general' in settings && 'gmap_api_key' in settings.dokan_general) {
-                return settings.dokan_general.gmap_api_key;
+            if ('dokan_appearance' in settings && 'gmap_api_key' in settings.dokan_appearance) {
+                return settings.dokan_appearance.gmap_api_key;
             }
         }
     }
diff --git a/changelog.txt b/changelog.txt
index aaf90404ee..a3c1fa7191 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+v2.9.20 -> August 23, 2019
+------------------------------------
+-   **Fix***   Geolocation map settings value is not saving
+-   **Fix***   Fix warning in vendor dashboard widget when seller setup wizard is not run
+-   **Fix***   Store banner height in vendor settings page it not honouring the saved settings
+-   **Fix***   Conflict with avada theme fution builder
+-   **Tweak*** Use WordPress backend date format while printing date in approved and cancelled withdraw request
+
 v2.9.19 -> July 29, 2019
 ------------------------------------
 -   **Fix***    Split orders created from admin dashboard
diff --git a/dokan.php b/dokan.php
index 33a146f247..7834b672e4 100755
--- a/dokan.php
+++ b/dokan.php
@@ -3,12 +3,12 @@
 Plugin Name: Dokan
 Plugin URI: https://wordpress.org/plugins/dokan-lite/
 Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
-Version: 2.9.19
+Version: 2.9.20
 Author: weDevs, LLC
 Author URI: https://wedevs.com/
 Text Domain: dokan-lite
 WC requires at least: 3.0
-WC tested up to: 3.6.5
+WC tested up to: 3.7.0
 Domain Path: /languages/
 License: GPL2
 */
@@ -78,7 +78,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '2.9.19';
+    public $version = '2.9.20';
 
     /**
      * Instance of self
diff --git a/languages/dokan-lite.pot b/languages/dokan-lite.pot
index b12544d989..5d99f22520 100644
--- a/languages/dokan-lite.pot
+++ b/languages/dokan-lite.pot
@@ -2,9 +2,9 @@
 # This file is distributed under the GPL2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dokan 2.9.19\n"
+"Project-Id-Version: Dokan 2.9.20\n"
 "Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
-"POT-Creation-Date: 2019-07-29 05:14:28+00:00\n"
+"POT-Creation-Date: 2019-08-23 09:48:15+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -444,32 +444,32 @@ msgstr ""
 msgid "Go to your Store Dashboard!"
 msgstr ""
 
-#: classes/template-dashboard.php:105 includes/admin/setup-wizard.php:535
+#: classes/template-dashboard.php:113 includes/admin/setup-wizard.php:535
 #: includes/order-functions.php:497 templates/dashboard/orders-widget.php:26
 msgid "Completed"
 msgstr ""
 
-#: classes/template-dashboard.php:110 templates/dashboard/orders-widget.php:31
+#: classes/template-dashboard.php:118 templates/dashboard/orders-widget.php:31
 msgid "Pending"
 msgstr ""
 
-#: classes/template-dashboard.php:115 includes/admin/setup-wizard.php:541
+#: classes/template-dashboard.php:123 includes/admin/setup-wizard.php:541
 #: includes/order-functions.php:512 templates/dashboard/orders-widget.php:36
 #: templates/orders/listing.php:137
 msgid "Processing"
 msgstr ""
 
-#: classes/template-dashboard.php:120 includes/order-functions.php:522
+#: classes/template-dashboard.php:128 includes/order-functions.php:522
 #: templates/dashboard/orders-widget.php:41
 msgid "Cancelled"
 msgstr ""
 
-#: classes/template-dashboard.php:125 includes/order-functions.php:517
+#: classes/template-dashboard.php:133 includes/order-functions.php:517
 #: templates/dashboard/orders-widget.php:46
 msgid "Refunded"
 msgstr ""
 
-#: classes/template-dashboard.php:130
+#: classes/template-dashboard.php:138
 msgid "On Hold"
 msgstr ""
 
@@ -519,7 +519,7 @@ msgid "I swear this is not your product!"
 msgstr ""
 
 #: classes/template-settings.php:70 classes/template-settings.php:74
-#: dokan.php:493 includes/admin/class-admin.php:146
+#: dokan.php:491 includes/admin/class-admin.php:146
 #: includes/admin/class-admin.php:207 includes/template-tags.php:354
 #: src/admin/pages/Settings.vue:3
 msgid "Settings"
@@ -674,21 +674,21 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
-#: dokan.php:212
+#: dokan.php:210
 msgid ""
 "The Minimum PHP Version Requirement for <b>Dokan</b> is %s. You are Running "
 "PHP %s"
 msgstr ""
 
-#: dokan.php:490
+#: dokan.php:488
 msgid "Get Pro"
 msgstr ""
 
-#: dokan.php:494
+#: dokan.php:492
 msgid "Documentation"
 msgstr ""
 
-#: dokan.php:525
+#: dokan.php:523
 msgid ""
 "Dokan requires WooCommerce to be installed and active. You can activate %s "
 "here."
@@ -1054,7 +1054,7 @@ msgstr ""
 msgid "Select a page to show your privacy policy"
 msgstr ""
 
-#: includes/admin/class-settings.php:502 includes/functions.php:3463
+#: includes/admin/class-settings.php:502 includes/functions.php:3469
 msgid ""
 "Your personal data will be used to support your experience throughout this "
 "website, to manage access to your account, and for other purposes described "
@@ -2991,19 +2991,19 @@ msgstr ""
 msgid "Gravatar Url"
 msgstr ""
 
-#: includes/class-dokan-privacy.php:195 includes/functions.php:2324
+#: includes/class-dokan-privacy.php:195 includes/functions.php:2330
 msgid "Facebook"
 msgstr ""
 
-#: includes/class-dokan-privacy.php:196 includes/functions.php:2328
+#: includes/class-dokan-privacy.php:196 includes/functions.php:2334
 msgid "Google Plus"
 msgstr ""
 
-#: includes/class-dokan-privacy.php:197 includes/functions.php:2332
+#: includes/class-dokan-privacy.php:197 includes/functions.php:2338
 msgid "Twitter"
 msgstr ""
 
-#: includes/class-dokan-privacy.php:198 includes/functions.php:2336
+#: includes/class-dokan-privacy.php:198 includes/functions.php:2342
 msgid "Pinterest"
 msgstr ""
 
@@ -3011,15 +3011,15 @@ msgstr ""
 msgid "Linkedin"
 msgstr ""
 
-#: includes/class-dokan-privacy.php:200 includes/functions.php:2344
+#: includes/class-dokan-privacy.php:200 includes/functions.php:2350
 msgid "Youtube"
 msgstr ""
 
-#: includes/class-dokan-privacy.php:201 includes/functions.php:2348
+#: includes/class-dokan-privacy.php:201 includes/functions.php:2354
 msgid "Instagram"
 msgstr ""
 
-#: includes/class-dokan-privacy.php:202 includes/functions.php:2352
+#: includes/class-dokan-privacy.php:202 includes/functions.php:2358
 msgid "Flickr"
 msgstr ""
 
@@ -3494,272 +3494,272 @@ msgstr ""
 msgid "Date is not valid"
 msgstr ""
 
-#: includes/functions.php:2060
+#: includes/functions.php:2066
 msgid "- Select a location -"
 msgstr ""
 
-#: includes/functions.php:2064 includes/functions.php:2087
+#: includes/functions.php:2070 includes/functions.php:2093
 msgid "Everywhere Else"
 msgstr ""
 
-#: includes/functions.php:2083
+#: includes/functions.php:2089
 msgid "- Select a State -"
 msgstr ""
 
-#: includes/functions.php:2105
+#: includes/functions.php:2111
 msgid "Ready to ship in..."
 msgstr ""
 
-#: includes/functions.php:2106
+#: includes/functions.php:2112
 msgid "1 business day"
 msgstr ""
 
-#: includes/functions.php:2107
+#: includes/functions.php:2113
 msgid "1-2 business day"
 msgstr ""
 
-#: includes/functions.php:2108
+#: includes/functions.php:2114
 msgid "1-3 business day"
 msgstr ""
 
-#: includes/functions.php:2109
+#: includes/functions.php:2115
 msgid "3-5 business day"
 msgstr ""
 
-#: includes/functions.php:2110
+#: includes/functions.php:2116
 msgid "1-2 weeks"
 msgstr ""
 
-#: includes/functions.php:2111
+#: includes/functions.php:2117
 msgid "2-3 weeks"
 msgstr ""
 
-#: includes/functions.php:2112
+#: includes/functions.php:2118
 msgid "3-4 weeks"
 msgstr ""
 
-#: includes/functions.php:2113
+#: includes/functions.php:2119
 msgid "4-6 weeks"
 msgstr ""
 
-#: includes/functions.php:2114
+#: includes/functions.php:2120
 msgid "6-8 weeks"
 msgstr ""
 
-#: includes/functions.php:2233
+#: includes/functions.php:2239
 msgid "All dates"
 msgstr ""
 
-#: includes/functions.php:2248
+#: includes/functions.php:2254
 #. translators: 1: month name, 2: 4-digit year
 msgid "%1$s %2$d"
 msgstr ""
 
-#: includes/functions.php:2340
+#: includes/functions.php:2346
 msgid "LinkedIn"
 msgstr ""
 
-#: includes/functions.php:2618
+#: includes/functions.php:2624
 msgid "Dokan Store Sidebar"
 msgstr ""
 
-#: includes/functions.php:2884
+#: includes/functions.php:2890
 msgid "View sales overview"
 msgstr ""
 
-#: includes/functions.php:2885
+#: includes/functions.php:2891
 msgid "View sales report chart"
 msgstr ""
 
-#: includes/functions.php:2886
+#: includes/functions.php:2892
 msgid "View announcement"
 msgstr ""
 
-#: includes/functions.php:2887
+#: includes/functions.php:2893
 msgid "View order report"
 msgstr ""
 
-#: includes/functions.php:2888
+#: includes/functions.php:2894
 msgid "View review report"
 msgstr ""
 
-#: includes/functions.php:2889
+#: includes/functions.php:2895
 msgid "View product status report"
 msgstr ""
 
-#: includes/functions.php:2892
+#: includes/functions.php:2898
 msgid "View overview report"
 msgstr ""
 
-#: includes/functions.php:2893
+#: includes/functions.php:2899
 msgid "View daily sales report"
 msgstr ""
 
-#: includes/functions.php:2894
+#: includes/functions.php:2900
 msgid "View top selling report"
 msgstr ""
 
-#: includes/functions.php:2895
+#: includes/functions.php:2901
 msgid "View top earning report"
 msgstr ""
 
-#: includes/functions.php:2896
+#: includes/functions.php:2902
 msgid "View statement report"
 msgstr ""
 
-#: includes/functions.php:2899
+#: includes/functions.php:2905
 msgid "View order"
 msgstr ""
 
-#: includes/functions.php:2900
+#: includes/functions.php:2906
 msgid "Manage order"
 msgstr ""
 
-#: includes/functions.php:2901
+#: includes/functions.php:2907
 msgid "Manage order note"
 msgstr ""
 
-#: includes/functions.php:2902
+#: includes/functions.php:2908
 msgid "Manage refund"
 msgstr ""
 
-#: includes/functions.php:2906
+#: includes/functions.php:2912
 msgid "Add coupon"
 msgstr ""
 
-#: includes/functions.php:2907
+#: includes/functions.php:2913
 msgid "Edit coupon"
 msgstr ""
 
-#: includes/functions.php:2908
+#: includes/functions.php:2914
 msgid "Delete coupon"
 msgstr ""
 
-#: includes/functions.php:2911
+#: includes/functions.php:2917
 msgid "View reviews"
 msgstr ""
 
-#: includes/functions.php:2912
+#: includes/functions.php:2918
 msgid "Manage reviews"
 msgstr ""
 
-#: includes/functions.php:2916
+#: includes/functions.php:2922
 msgid "Manage withdraw"
 msgstr ""
 
-#: includes/functions.php:2919
+#: includes/functions.php:2925
 msgid "Add product"
 msgstr ""
 
-#: includes/functions.php:2920
+#: includes/functions.php:2926
 msgid "Edit product"
 msgstr ""
 
-#: includes/functions.php:2921
+#: includes/functions.php:2927
 msgid "Delete product"
 msgstr ""
 
-#: includes/functions.php:2922
+#: includes/functions.php:2928
 msgid "View product"
 msgstr ""
 
-#: includes/functions.php:2923
+#: includes/functions.php:2929
 msgid "Duplicate product"
 msgstr ""
 
-#: includes/functions.php:2924
+#: includes/functions.php:2930
 msgid "Import product"
 msgstr ""
 
-#: includes/functions.php:2925
+#: includes/functions.php:2931
 msgid "Export product"
 msgstr ""
 
-#: includes/functions.php:2928
+#: includes/functions.php:2934
 msgid "View overview menu"
 msgstr ""
 
-#: includes/functions.php:2929
+#: includes/functions.php:2935
 msgid "View product menu"
 msgstr ""
 
-#: includes/functions.php:2930
+#: includes/functions.php:2936
 msgid "View order menu"
 msgstr ""
 
-#: includes/functions.php:2931
+#: includes/functions.php:2937
 msgid "View coupon menu"
 msgstr ""
 
-#: includes/functions.php:2932
+#: includes/functions.php:2938
 msgid "View report menu"
 msgstr ""
 
-#: includes/functions.php:2933
+#: includes/functions.php:2939
 msgid "Vuew review menu"
 msgstr ""
 
-#: includes/functions.php:2934
+#: includes/functions.php:2940
 msgid "View withdraw menu"
 msgstr ""
 
-#: includes/functions.php:2935
+#: includes/functions.php:2941
 msgid "View store settings menu"
 msgstr ""
 
-#: includes/functions.php:2936
+#: includes/functions.php:2942
 msgid "View payment settings menu"
 msgstr ""
 
-#: includes/functions.php:2937
+#: includes/functions.php:2943
 msgid "View shipping settings menu"
 msgstr ""
 
-#: includes/functions.php:2938
+#: includes/functions.php:2944
 msgid "View social settings menu"
 msgstr ""
 
-#: includes/functions.php:2939
+#: includes/functions.php:2945
 msgid "View seo settings menu"
 msgstr ""
 
-#: includes/functions.php:3116
+#: includes/functions.php:3122
 msgid "Saturday"
 msgstr ""
 
-#: includes/functions.php:3119
+#: includes/functions.php:3125
 msgid "Sunday"
 msgstr ""
 
-#: includes/functions.php:3122
+#: includes/functions.php:3128
 msgid "Monday"
 msgstr ""
 
-#: includes/functions.php:3125
+#: includes/functions.php:3131
 msgid "Tuesday"
 msgstr ""
 
-#: includes/functions.php:3128
+#: includes/functions.php:3134
 msgid "Wednesday"
 msgstr ""
 
-#: includes/functions.php:3131
+#: includes/functions.php:3137
 msgid "Thursday"
 msgstr ""
 
-#: includes/functions.php:3134
+#: includes/functions.php:3140
 msgid "Friday"
 msgstr ""
 
-#: includes/functions.php:3137
+#: includes/functions.php:3143
 msgid "Off Day"
 msgstr ""
 
-#: includes/functions.php:3444
+#: includes/functions.php:3450
 msgid "privacy policy"
 msgstr ""
 
-#: includes/functions.php:3484
+#: includes/functions.php:3490
 msgid "Please Login to Continue"
 msgstr ""
 
diff --git a/package.json b/package.json
index 79d4024e20..a14de4ffe0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dokan",
-  "version": "2.9.19",
+  "version": "2.9.20",
   "description": "A WordPress marketplace plugin",
   "author": "weDevs",
   "license": "GPL",
diff --git a/readme.txt b/readme.txt
index 4871032b73..c814d54805 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: WooCommerce multivendor marketplace, multi vendor marketplace, multi selle
 Requires at least: 4.4
 Tested up to: 5.2.2
 WC requires at least: 3.0
-WC tested up to: 3.6.5
+WC tested up to: 3.7.0
 Requires PHP: 5.6
 Stable tag: trunk
 License: GPLv2 or later
@@ -284,6 +284,14 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 == Changelog ==
 
+v2.9.20 -> August 23, 2019
+------------------------------------
+-   **Fix***   Geolocation map settings value is not saving
+-   **Fix***   Fix warning in vendor dashboard widget when seller setup wizard is not run
+-   **Fix***   Store banner height in vendor settings page it not honouring the saved settings
+-   **Fix***   Conflict with avada theme fution builder
+-   **Tweak*** Use WordPress backend date format while printing date in approved and cancelled withdraw request
+
 v2.9.19 -> July 29, 2019
 ------------------------------------
 -   **Fix***    Split orders created from admin dashboard