@rafaelfranca Look OK? https://github.com/rails/rails/pull/12893/files#diff-6c21f4fa097b56799e5156e7b686fe28R31