Merge branch 'encoder' into hydro-devel