Merge branch '1.6.x' into test