Do not overwrite mapped fields if original source field is empty

Closes #3567230

Merge request reports

Loading