[GIT PULL] thread fixes v5.5-rc7