Merge "[entry] added delay_write timer deletion code when entry is deleted (bug fix...