Merge branch 'jn/eoie-ieot'