Merge branch 'master' into Eran
use match_datetime in forecast
Merge branch 'Eran'