[HFIX] Fix null values

Merged diego.barreto requested to merge HFIX into 12.0

Merge request reports