Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint