Removed json dump and emediate load, makes no difference
Merge branch 'remove_json' into allow-local-assets
Simplify merge with upstream 362769d5ee5fcfa80899c0c71c3a8b73aa21f55f.