Merge "bug fix for SO default input"