Merge remote-tracking branch 'origin/development' into development

Author: timsavage

poetry.lock

@@ -515,7 +515,9 @@ def apply(
             specified is returned.
 
         """
-        context = context or {}
+        if context is None:
+            context = {}
+
         mapping_result = mapping_result or cls.default_mapping_result
         context.setdefault("_loop_idx", [])