Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev