Merge branch 'encoding'