solving issue of hanging worker threads
Merge branch 'master' into feature/projectMeta