merge from 6.0, custom redundancy model failover fixes