Merge "Tests for preserving content ID and origin during undeletion"