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

Parent child characteristics

See merge request !7
2 jobs for 10-remove-vinni-related-item
in 2 minutes and 43 seconds, using 0 compute credits, and was queued for 2 seconds