Merge changes to E extends stuff