Merge branch '1.8.0' into 1.8.1