Changed behavior of checkbox question
Merge