Merge pull request #755 from aldur/manage_script_name_fix

manage_script_name fix for tricky resources