Merge "Bug-4957 Double candidate Onwership initial commit"