Fix convert Option widget messages to string before hand-off
Merge remote-tracking branch 'origin/master'