Merge branch 'tr/void-diff-setup-done'