Merge develop into infrahub-release-1.12

Draft
IN
10h ago
+1755-63

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