Patch for unmerged changes in Brooklyn PR 337