Merge branch 'nd/graph-width-padded' into maint