Merge "unify data existence check"