Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5