Merge "Avoid edit stash log spam for bots"