Merge "Fix clean-up order when player crashes" into main