JSON: Fix outstanding cherry-pick issues in afa27c77
JSON: Fix outstanding cherry-pick issues in afa27c77

MRtrix3/mrtrix3,MRtrix3/mrtrix3,MRtrix3/mrtrix3,MRtrix3/mrtrix3,MRtrix3/mrtrix3,MRtrix3/mrtrix3