Merge "bug_24465209_workaround shouldn't affect the host." into main