Merge "Backend's vfModule upgrade: test refinement + code fix"