Merge branch '6.4' into 7.1

* 6.4:
  [#20566] Add UX team description
  Fix typo

Author: wouterj

contributing/code/core_team.rst

@@ -77,7 +77,7 @@ Active Core Members
 
   * **Ryan Weaver** (`weaverryan`_);
   * **Kevin Bond** (`kbond`_);
-  * **Simon Andre** (`smnandre`_);
+  * **Simon André** (`smnandre`_);
   * **Hugo Alliaume** (`kocal`_);
   * **Matheo Daninos** (`webmamba`_).