Merge "perf: Tighten (and fix) the grouping condition" into FPIIM_WIP