6.4-pl checkpoint
Merge branch '6.4' into stable