Merge branch 'parent-child-characteristics' into 'develop'
fix integration tests See merge request !15
WARNING: Network maintenance operation scheduled for Thursday, 7 May between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thanks.
fix integration tests See merge request !15