This includes a possible fix for the crashes we see in copy.c (d9e27703) (cherry picked from commit 8475cadf)