Merge "Fix thread booster" into oc-dev