bug fix timepicker
Merge branch 'hotfix/bug-fix-timepicker' into develop