Merge pull request #2039 from 9rnsr/vfield

Add `-vfield` switch for user code migration by fixing bug 3449