Merged eigen/eigen into default