Merge "Update go.mod to 1.21" into main