Update scripts and upstream change