Merge branch 'develop' into feature/#19-Optimizing-panel

4 jobs for feature/#19-Optimizing-panel in 2 minutes and 38 seconds