Merge branch 'develop' into feat/343-integration-of-mimir-deployment-in-production-environment