Merge pull request #2628 from wvanlint/fix_multiple_shutdown_results