CMW based recovery

Change-Id: I83741bfb251b8d69e04e80efb6a42e342f3c7b1c