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

Merge-request: !5039