Merge develop into infrahub-develop

Merged
IN
8d ago
+6-0

Merging develop into infrahub-develop after merging pull request #1521.