Merge "Update smudged entries when writing index" into stable-2.0