Merge pull request #3932 from lambdageek/dev-handles-outargs