Merge branch 'dev' into deps/eslint-plugin-jsdoc-50.x

Merge branch 'dev' into deps/eslint-plugin-jsdoc-50.x #23772