Commit 03
Commit 04
Merge branch 'hqd' into mStore_Nhan