Merge "fix failing thread object run" into gingerbread