Merge branch 'bug157_wizard_virtualkeyboard'