Merge change 24794

* changes:
  Fix the final [mis]uses of iscopy.