Merge branch 'dev' into thy
add line restriction to threads
Merge branch 'thy' into dev