Merge "Upgrade either to 1.8.0"