Merge "limit IFINDEX matching to specific actions."