merging pei-copy changes into master