Merge "Prefer visiblePath if available" into rvc-dev