diff --git a/cloudify/context.py b/cloudify/context.py
index e2cfbda50..58d0b64ca 100644
--- a/cloudify/context.py
+++ b/cloudify/context.py
@@ -427,12 +427,12 @@ def number_of_instances(self):
     @property
     def is_external(self) -> bool:
         """If this is a resource that Cloudify manages or not"""
-        return self._properties.get('use_external_resource', False)
+        return self.properties.get('use_external_resource', False)
 
     @property
     def resource_id(self):
         """The resource's ID outside of Cloudify"""
-        return self._properties.get('resource_id')
+        return self.properties.get('resource_id')
 
 
 class NodeInstanceContext(EntityContext):
diff --git a/cloudify/tests/test_context.py b/cloudify/tests/test_context.py
index c9bd98d49..d8eea3825 100644
--- a/cloudify/tests/test_context.py
+++ b/cloudify/tests/test_context.py
@@ -323,16 +323,19 @@ def test_source_target_not_in_relationship(self):
                       'deployment context.', str(cm.exception))
 
     def test_node_ctx_properties(self):
-        ctx_node = context.NodeContext(
-            {
-                'node': {
-                    'properties': {
-                        'use_external_resource': False,
-                        'resource_id': 'foo'
-                    }
-                }
+
+        def get_node(*_, **__):
+            return {
+            'properties': {
+                'use_external_resource': False,
+                'resource_id': 'foo'
             }
-        )
+        }
+
+        endpoint = Mock()
+        endpoint.get_node = get_node
+        ctx_node = context.NodeContext(
+            {'node_id': 'foo'}, endpoint=endpoint)
         self.assertFalse(ctx_node.is_external)
         self.assertEqual(ctx_node.resource_id, 'foo')
 
diff --git a/cloudify_common-6.4.0-centos-Core-py36-none-linux_aarch64.wgn b/cloudify_common-6.4.0-centos-Core-py36-none-linux_aarch64.wgn
new file mode 100644
index 000000000..0b14e0810
Binary files /dev/null and b/cloudify_common-6.4.0-centos-Core-py36-none-linux_aarch64.wgn differ
diff --git a/dev-requirements.txt b/dev-requirements.txt
new file mode 100644
index 000000000..e69de29bb