Create update from new
Merge remote-tracking branch 'remotes/origin/master' into linhlam
test