Merge branch 'ethoc-fixes'