update formulas by definition
hotfix sortableDateTime()
Merge branch 'develop'
Merge branch 'master' into develop