am d7b5f3da: Merge "Fix hang" into klp-dev

* commit 'd7b5f3dab1c3bc0aa98698314183149426559a3c':
  Fix hang