added the patch of unique
Merge remote-tracking branch 'origin/dynamic_upstream_check' into dynamic_upstream_check