Exporting encoder manifest
Merge with master