Merge "resourcemanager: rework death handling" into main