Merge develop into infrahub-release-1.12

Merged
IN
6h ago
+3-3

Merging develop into infrahub-release-1.12 after merging pull request #1500.