VE-1610: Set values only for properties that are really being used