Merge branch 'ds/reachable-first-parent-fix'