Merge "Remove unused mutex fields" into main