Remerging branch&HEV

finished