Merge pull request #3197 from BrzVlad/fix-thread-layout