Merge "Fixes to script"