Merge with original 1.7.0 version and apply changements.