Redis feeder rebase for #1672