8277672: Better invocation handler handling

Reviewed-by: mbaesken
Backport-of: 0691804665559f1935b7361d5f1207ac46f823f0
1 file changed