merge MS changes

This commit is contained in:
2023-03-22 15:08:37 +01:00
35 changed files with 3325 additions and 197 deletions