LPS-38689 Recommit, now compatible with GA2
SOS-1790 Ensure extra data is not null