Merge in upstream changes

Bug fix for multiple checkbox