Merge branch '1.8'