6.4p1 upstream
Merge branch '6.4p1-upstream'