Merge "vfc adapter url correction"