Merge "Fix fail verification without cleaning child session data"