multiple instances from running fixes #3293 port 1.6 (cherry picked from commit 7e18a68b82)
7e18a68b82