Merge from scriptdev2