Merge "Fixing missing unlinktoDeath" into sc-dev