Commit 06
Merge branch 'hqd' into mStore_Nhan