Merge "Mark scripts as threadable or not"