Merge develop into infrahub-develop

Merged
IN
8d ago
+109-6

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