resolved conflicts and merged master into the migration
1 related merge request: !1 Migration to plugin template and add climpact functionality
branch
2 jobs
23 seconds, queued for 3 seconds