Merge branch '1.8.1'