Merge branch 'v4.6.x' into tmp