Merge "Revert "Fix DeprecationWarning of jsonschema""