Merge "Fix junits broken by change in is-alive type"