merge from SC03E
update recovery