fix date and timezone error
fix date and timezone error
Merge branch 'fix_date_feature' into develop