Backport fc6df49