Merge remote-tracking branch 'origin/dev-forecast-tests' into dev-3days-forecast-193

in 1 minute and 30 seconds, using 0 compute credits, and was queued for 1 second