Merge pull request #3471 from cyyself/no_plusarg

add WithNoSimulationTimeout
8 jobs for dev
in 0 seconds and was queued for 98 minutes and 48 seconds