We have a copy change in flight to help deal with this:
So, closing this for now in favor of that topic.