Merge branch 'parent-child-characteristics' into 'develop'

Parent child characteristics

See merge request !14
2 jobs for develop
in 1 minute and 17 seconds, using 0 compute credits, and was queued for 1 second