Update export.
Merge remote-tracking branch 'origin/nhannguyen3' into dev