Merge branch 'jv/maint-no-ext-diff' into maint