Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1