Merge branch 'hotfix/fix_get_date_interval_method'
Fix bugs
Merge branch 'hotfix/fix_date_helper_bugs' into develop