6.4.4-release checkpoint
Merge branch '6.4.4' into stable