And this is the aggregated patch for the entire feature: