recovery-related addition

Change-Id: Ic35239cb8e143a53b81af85f9247d645879f62a3