Use faster no wait method
Merge branch 'master' into frodo