Fix threading issue.

This PR fixes a threading issue, and merges all recent upstream Convergence commits.