Merge "Add access tracker to renamed accounts"