Updated script
Synced from master
Synced from master