Fixing issue with copying from develop