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