Bug 16044: Add deep cloning