Merge "[PATCH] Fix TRM deadlock scenario in reclaim" into main