Merge "[Feature][T106] Optimize partition damage recovery logic"