wip: got rid of old extra info keys (PointResultExtraInfoKeys) in favor of EEIK
Merge remote-tracking branch 'origin/eclipse' into eclipse