Merge branch 'tf/diff-whitespace-incomplete-line' into maint