Merge branch 'hotfix-4.9.7'
Fixed time question handling
Merge branch 'hotfix-4.9.8' into develop