Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint