Merge branch 'B9720CheckboxVariousSetups' into 'master'

B9720 checkbox various setups

See merge request !221
3 jobs for master in 3 minutes and 39 seconds (queued for 3 seconds)