Merge 261024: fix PIM input regression.