Fixed time question handling
Merge branch 'hotfix-4.9.8'