Merge branch '8139-thread'