TK add 3:19PM
TK brach add 3:27PM
Merge remote-tracking branch 'origin/ThachKieu' into Thanh-LE