v0.6.4.4 Branch Merge

v0.6.4.4 branch merge into the master.