Follow rails/rails#36448, and follow rails/rails#36420, rails/rails@1340498, and rails/rails@6607ecb required for that change. This PR fixes the following rails/activerecord's errors. % cd rail...