Nalexander/bug 966386 copy tweaks