Merge "Upversion to 1.7.0"