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