Merge branch 'issue/626' into 'develop'

SCRUM#626: Fix a bug in the family shield options

See merge request !72
7 jobs for develop in 10 minutes and 15 seconds (queued for 138 minutes and 39 seconds)