Fix cookie creation when temp data is null
Merge remote-tracking branch 'upstream/master'