Backport 1.8 gh 4401