diff --git a/openvpn/client/cliopthelper.hpp b/openvpn/client/cliopthelper.hpp
index 20384a9e8..5bb3050ba 100644
--- a/openvpn/client/cliopthelper.hpp
+++ b/openvpn/client/cliopthelper.hpp
@@ -358,7 +358,7 @@ class ParseClientConfig
             if (content_list)
             {
                 content_list->preprocess();
-                options.parse_from_key_value_list(*content_list, &limits);
+                options.parse_from_key_value_list(*content_list, "OVPN_ACCESS_SERVER", &limits);
             }
             process_setenv_opt(options);
             options.update_map();
diff --git a/openvpn/common/options.hpp b/openvpn/common/options.hpp
index d594c41a3..0fea4483a 100644
--- a/openvpn/common/options.hpp
+++ b/openvpn/common/options.hpp
@@ -710,12 +710,22 @@ class OptionList : public std::vector<Option>, public RCCopyable<thread_unsafe_r
             return key.length() + value.length();
         }
 
-        Option convert_to_option(Limits *lim) const
+        Option convert_to_option(Limits *lim, const std::string &meta_prefix) const
         {
             bool newline_present = false;
             Option opt;
             const std::string unesc_value = unescape(value, newline_present);
-            opt.push_back(key);
+
+            if (string::starts_with(key, meta_prefix))
+            {
+                opt.push_back(std::string(key, meta_prefix.length()));
+                opt.set_meta();
+            }
+            else
+            {
+                opt.push_back(key);
+            }
+
             if (newline_present || singular_arg(key))
                 opt.push_back(unesc_value);
             else if (unesc_value != "NOARGS")
@@ -966,14 +976,17 @@ class OptionList : public std::vector<Option>, public RCCopyable<thread_unsafe_r
 
     // caller may want to call list.preprocess() before this function
     // caller should call update_map() after this function
-    void parse_from_key_value_list(const KeyValueList &list, Limits *lim)
+    void parse_from_key_value_list(const KeyValueList &list, const std::string &meta_tag, Limits *lim)
     {
+        const std::string meta_prefix = meta_tag + "_";
+
         for (KeyValueList::const_iterator i = list.begin(); i != list.end(); ++i)
         {
             const KeyValue &kv = **i;
             if (lim)
                 lim->add_bytes(kv.combined_length());
-            const Option opt = kv.convert_to_option(lim);
+
+            Option opt = kv.convert_to_option(lim, meta_prefix);
             if (lim)
             {
                 lim->add_opt();
diff --git a/test/unittests/test_cliopt.cpp b/test/unittests/test_cliopt.cpp
index ab842067c..25a4a840c 100644
--- a/test/unittests/test_cliopt.cpp
+++ b/test/unittests/test_cliopt.cpp
@@ -217,4 +217,28 @@ TEST(config, onlypullortlsclient)
             option_error,
             "option_error: Neither 'client' nor both 'tls-client' and 'pull' options declared. OpenVPN3 client only supports --client mode.");
     }
-}
\ No newline at end of file
+}
+
+TEST(config, meta_option_in_content)
+{
+    OptionList options;
+    auto cfg = minimalConfig + "\n# OVPN_ACCESS_SERVER_AAA=BBB";
+
+    OptionList::KeyValueList kvl;
+    kvl.push_back(new OptionList::KeyValue("OVPN_ACCESS_SERVER_CCC", "DDD"));
+
+    auto parsed_config = ParseClientConfig::parse(cfg, &kvl, options);
+
+    ClientOptions::Config config;
+    config.dco_compatible = true;
+    config.proto_context_options.reset(new ProtoContextOptions());
+    ClientOptions cliopt(options, config);
+
+    auto opt = options.get("AAA");
+    ASSERT_TRUE(opt.meta());
+    ASSERT_EQ(opt.get(1, 256), "BBB");
+
+    opt = options.get("CCC");
+    ASSERT_TRUE(opt.meta());
+    ASSERT_EQ(opt.get(1, 256), "DDD");
+}