don't try to set primitive fields if no value found
Merge remote-tracking branch 'origin/master'