Merge branch 'master' into Adar
forecast: timing features UI
Merge branch 'Adar'