Merge "Script calling cleanups"