Add UniqueID for export file
Merge remote-tracking branch 'origin/Chatchai'