Merge pull request #103 from phuonghuynh/master

Done for R11
Merge commit '8fd1a1e7419eb25e9373eea31a485e82d592dc66'
Merge pull request #104 from phuonghuynh/master

Fix issue when doing deploy
Merge commit 'cd6587932949daef5ca7079fdc24f16ec7454bf1'
Merge commit '2fe1c413eba5854fbc969b2b0d6c8bd14f66b744'