Backport #2349789