XG-1537 High Availability