Removed unused tls variable
Merge branch 'devel'