Backport changes.