BC fixes for disabled checkboxes

Patch 2 of 2.  See #1102 for first patch

Note that this requires the first patch to has been merged and brought forward to master branch.

see: d504642
see: #3545