changing guarantee to exception in extproc code
Merge branch 'v1.11.x' into next