Forward port backports

it's that time again @square/railsfork-contributors