Merge "Not using stale object to diagnose stale object" into sc-v2-dev