Merge branch 'master' into issue/3475-remove-ARE

Author: zinduolis

Gemfile.lock

@@ -90,7 +90,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.18.1)
+    json (2.19.1)
     json-schema (6.2.0)
       addressable (~> 2.8)
       bigdecimal (>= 3.1, < 5)