avoid using json function if not available
Merge remote-tracking branch 'refs/remotes/origin/3.1.x'