Merge "Remove deprecated 'json' module"