Fix encoder architecture
Merge branch 'landing-2849' into upstream-master

e aborts
ge aborts