Fixes operation timeout and invocation retry issues

Fixes #4123
Fixes #4113