Merge branch 'issue/423' into 'develop'

SCRUM#423: Change control panel error messages regarding the family-shield

See merge request !74
5 jobs for develop in 6 minutes and 1 second (queued for 3 seconds)