Manually merges !2052
I left out the various commented nationalities since I do not understand if your additions work name-wise. If you want to repropose the merge with them, perhaps pregmodfan can take a look at it. I'm not certain though, so it may be best to just follow the guidelines strictly.