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

Parent child characteristics

See merge request !5
in 37 seconds, using 0 compute credits, and was queued for 1 minute and 52 seconds