JARVIS-284 Temp fix to remove hour:minute from labels.
JARVIS-254 Reversed commit, need to move values to options.
Merge branch 'feature/JARVIS-254' into hotfix/2.3.1