Commit 10
Merge branch 'hqd' into mStore_Nhan