Merge branch 'dev-saving-seasonal' into 'master'

Merge most recent changes and fix bug that affected loading of daily data

See merge request es/auto-s2s!12