Rebase from ACR.