backporting virtual field support from acq branch