Issue #2931578 by smustgrave, martin107: Type consistency remove NULLs

Stephen Mustgraverequested to merge
issue/simple_gmap-2931578:2931578-type-consistency-remove into 4.0.x

Closes #2931578

Merge request reports