support for latest eclipse components
Fixed Merge