Merge "Making transitions between gone hosts work better" into rvc-dev