Build #12:   handle failover on branch failover about 9 years ago