CB-6721 ignore null values if previous value was not null