Commit 07
Merge branch 'hqd' into mStore_Nhan