Update encoder manifest
Merge branch 'master' into coordinate_encoder