Merge branch '2.x' into gh-1507