Backport 3609