Merge branch 'tr/void-diff-setup-done' into maint-1.7.11