diff --git a/v2/ansible/executor/connection_info.py b/v2/ansible/executor/connection_info.py
index d70422399f3..19f027aaef1 100644
--- a/v2/ansible/executor/connection_info.py
+++ b/v2/ansible/executor/connection_info.py
@@ -79,6 +79,10 @@ class ConnectionInformation:
         self.sudo_user   = play.sudo_user
         self.sudo_pass   = play.sudo_pass
 
+        # non connection related
+        self.no_log      = play.no_log
+        self.environment = play.environment
+
     def set_options(self, options):
         '''
         Configures this connection information instance with data from
@@ -127,6 +131,12 @@ class ConnectionInformation:
         self.sudo_user   = ci.sudo_user
         self.sudo_pass   = ci.sudo_pass
         self.verbosity   = ci.verbosity
+
+        # other
+        self.no_log      = ci.no_log
+        self.environment = ci.environment
+
+        # requested tags
         self.only_tags   = ci.only_tags.copy()
         self.skip_tags   = ci.skip_tags.copy()
 
@@ -139,7 +149,7 @@ class ConnectionInformation:
         new_info = ConnectionInformation()
         new_info.copy(self)
 
-        for attr in ('connection', 'remote_user', 'su', 'su_user', 'su_pass', 'sudo', 'sudo_user', 'sudo_pass'):
+        for attr in ('connection', 'remote_user', 'su', 'su_user', 'su_pass', 'sudo', 'sudo_user', 'sudo_pass', 'environment', 'no_log'):
             if hasattr(task, attr):
                 attr_val = getattr(task, attr)
                 if attr_val:
diff --git a/v2/ansible/playbook/play.py b/v2/ansible/playbook/play.py
index 22d57dfa57c..3de550b23c7 100644
--- a/v2/ansible/playbook/play.py
+++ b/v2/ansible/playbook/play.py
@@ -80,6 +80,7 @@ class Play(Base, Taggable):
 
     # Flag/Setting Attributes
     _any_errors_fatal    = FieldAttribute(isa='bool', default=False)
+    _environment         = FieldAttribute(isa='dict', default=dict())
     _max_fail_percentage = FieldAttribute(isa='string', default='0')
     _no_log              = FieldAttribute(isa='bool', default=False)
     _serial              = FieldAttribute(isa='int', default=0)