Merged threading-layer into development