Merge pull request #5929 from cotequeiroz/nixio-remove-tls