Merge "Fix hang" into klp-dev