Merge thread-2-8-branch