The problem with issue #317 (moved) is because we didn't assign the cpid of the call site to the parent.
The problem with issue #328 (moved) is because we assign ALL cpid of the call site to the parent and in some cases, the id of the call site is THE SAME as the id of the parent!
This commit will assign the cpid of the call site to the parent IF they don't have the same cpid.
Also, this merge fix issue #327 (moved)