Merge branch V2.1 prefab onto Main

[IanSuper7]

Production boards are now available and the development work on this branch should be made available to builders of the production boards.

[micromouseonline]

I renamed the file to the old name and arbitrarily resolved the conflicts. You might want to check that the changes I made are mostly correct.
Then renamed the file again to the new name.
Does your editor automatically update the file header comments? that can be good but I fould that it can generate changes that contribute nothing in git. For example, updating the last save date.