Merge branch 'feature/forecast'