fix: json shall be checked beforehand
Merge branch 'master' into aggressive