Merge change Ic93ca0d7

* changes:
  Don't return when blocking is true.