Removed isEnabled check.
Merge branch 'hotfix/datefreeze'
Merge branch 'hotfix/datefreeze' into develop
Merge branch 'master' into develop