Merge "Correct the rest URI of VFC"