Merge main into the branch, resolve any conflicts, implement modifiers for newly added copy functionn.