Update input-wizard
Merge branch 'zigbert-patch-1' into testing