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