Renamed "checkbox" form field property to "optional"
Merge remote-tracking branch 'origin/master'