Merge branch 'jc/same-encoding' into maint