Merge branch 'host-data-json'

Fixes CLOWNFISH-83.