Ensure the app is really running before killing it
Merge commit 'b1267ebf56ff3afb4cdff54f3047adfe690c80fc' into named-rebuild-fix