unset objects before merging
Merge branch 'json' into dev

* json:
  unset objects before merging