display the checkboxes checked correctly
Merge remote-tracking branch 'upstream/pr/43' into orchestration

* upstream/pr/43:
  display the checkboxes checked correctly