#660 - Finally got the condition block to accept user input after the condition block shows up.
Merge remote-tracking branch 'origin/t660' into t660