Cherry-pick 'fix-json-smart' into 'release/0.13'

David Diederichrequested to merge
cherry-pick-273fbdff into release/0.13

Original MR: !157 (merged)

Edited by David Diederich

Merge request reports