fix an issue when blocked call prevents the cyclic mode to proceed
Merge remote-tracking branch 'origin/master'