Bug 25728: Fix the clone field feature