Verified the fail function is triggered when a negotiate is aborted.

#2340
Merge branch 'release' into dev