Merge pull request #11786 from shreyashah115/fix-json

Fixed json affected by latest merge