Merge branch 'wip/remove-mld-threads'