Merge branch '1.5.x' into merge