Merge branch 'backport-3.18-graphviz-restore-per-target'