Merge pull request #4425 from ezyang/pr/backpack-fixes-more