Merge branch 'jk/archive-zip-userdiff-config' into maint