Ensure parent footprints include all their children
Merge branch 'u/jbosch/DM-340'