merging in dev script changes