Add new question to new wizard
Merge branch 'release/0.4' into release/0.5