hide map for datajson
Merge branch 'hide-map-for-datajson' into build-29