Merge develop into infrahub-release-1.12

Merged
IN
10d ago
+12-0

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