Merge "Make the bug 24465209 workaround implementation clearer." into main