New trunk snapshot from ci
Merge branch '6.4.x' into 'master'