Merge the realtime failover branch