atomic: merge (delete & copy) changes from trunk


svn path=; revision=84456