Merge branch 'master' into Eran
Merge branch 'master' into Eran
Fix forecast view
Merge branch 'Eran'