Merge pull request #56987 from idryomov/wip-65573