updates for generating encoding files
Merge branch 'dev'