Merge branch '2.x.x' into '1.x.x'
