Merge branch 'dev-Downscaling' into 'master'

Dev downscaling

See merge request !123
2 jobs for master
in 15 minutes and 54 seconds, using 0 compute credits, and was queued for 1 second