Merge "Script improvements"