Merge "Fix e2e test of upgrade VFM"