Merge branch 'tr/log-full-diff-keep-true-parents' into maint