Backports

@airbnb/di