Merge changes from master to be able to continue development

2 jobs for dev-visualization-seasonal
in 9 minutes and 48 seconds, using 0 compute credits, and was queued for 1 second