remove spatial for datajson as well
Merge branch 'remove-spatial' into build-28