can someone merge https://rbcommons.com/s/twitter/r/2685/ for me? hoping to let it bake in master a few days before the friday release.