Rebase from ACR. Cleaned removed files.