Merge "Add ability to handle multiple intercepts per pid." into main