NSB_INVALID_LINE
Merge branch 'threading'