Merge branch 'master' into Adar
forecast: add progress
Merge branch 'Adar'