Merge branch 'develop' into bugfix/fix-vue-eslint-issues

4 jobs for bugfix/fix-vue-eslint-issues in 3 minutes and 47 seconds (queued for 3 seconds)