Start merging the sixth batch for 1.8.0