Commit 08
Merge branch 'hqd' into mStore_Nhan