Merge branch 'ew/normal-to-e'