Merge master into dependabot/npm_and_yarn/fast-xml-parser-5.3.4

Merge master into dependabot/npm_and_yarn/fast-xml-parser-5.3.4 #1938