Merge branch 'hotfix/ident' into develop
Merge branch 'master' into develop
refactor day range setup
merge master into develop