Merge branch 'jc/graph-post-root-gap' into pu