Merge "Update empty overflow copy"