Merge "Enhanced run.sh"