8.2
Merge branch '7.4' into 8.1
[JsonStreamer] Add a "cache_variant" option to the generated cache file name