Merge remote-tracking branch 'upstream/pull/1652'

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 046f8a462d54a5881620239251c063091ac87f15,e4b521c1ae70132c35ab80002340824946e4af34..653098e8e563571b4ceeab8a94bdc169cce4e685
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -43,12 -43,9 +43,12 @@@ GE
        tzinfo (~> 1.1)
      addressable (2.5.2)
        public_suffix (>= 2.0.2, < 4.0)
-     arel (7.1.4)
 +    annotate (2.7.2)
 +      activerecord (>= 3.2, < 6.0)
 +      rake (>= 10.4, < 13.0)
+     arel (8.0.0)
      ast (2.3.0)
-     autoprefixer-rails (7.1.4.1)
+     autoprefixer-rails (7.1.5)
        execjs
      bigdecimal (1.1.0)
      builder (3.2.3)