Launch timeout fix for timeout 0
Merge cleanup