i058959 - for support both eclipse kelper and luna