Fix question_grid test error
Merge branch 'master' into dev