Case 2878 - Added fieldset for checkboxes.
Merge branch 'case-2878' into develop

* case-2878:
  Case 2878 - Added fieldset for checkboxes.