Good points. I would like to suggest that we should go a little further than this, and TEACH cultural diversity, in government and corporate offices.
I think back to about 1985, when I was working for the State of Alaska. It was ordered that every state employee had to take a class they had created to help meet EEO standards. Now I will admit that I groused about it like most of us, but I took the class along with everyone else, and it changed my life.
There were few Blacks in Alaska at the time, but there is a very large indigenous population. I learned, for example, differences in the communication and information processing methods between Whites and indigenous Americans. For example, when two White people talk to each other, one often interrupts while the other is talking, or, even if they are being courteous, as soon as one speaker finishes the other immediately responds. Indigenous peoples, on the other hand, do not interrupt, and they often delay some seconds before they respond. This is because White people may be listening, but they are formulating their response while they are listening, whereas Indigenous peoples wait until the speaker is finished before they design their response.
The class also spent substantial time talking about all the ways that men make offices uncomfortable for women, and really emphasized the actions that can lead to harassment or assault allegations, and the difference between the two terms. I never forgot that, and for the next 30 years working in public and private organizations, I never had a single complaint lodged against me.
I will say that it was all accomplished without attacking or shameblaming Whites or men.
Private sector companies don't do this. They should.