Merge "Remove obsolete comment about Weaver deadlock" into main