Merge "Fixed diagram copy/paste implementations to re-identify diagram elements"