highly-available

Change-Id: I64857230995faca52a185aebf0b5099351932d9c