Merge pull request #4577 from TranceLove/feature/generic-copy-util-improvements