Fix merge
Fix merge
Fix merge
Fix merge
Handle different VFS protocols in AnnotationDetector (#1701)