In the meanwhile, I cherry-picked it for the refactoring branch.