Backport 1.8 3691