Support push/pull without clearing target storage