Cherry-pick JSON Smart upgrades to 'release/0.13'

Original MRs: !159 (merged) and !161 (merged)

Merge request reports

Loading