Merge remote-tracking branch 'origin/master' into codex/remove-d2plugin

# Conflicts:
#	ci/release/changelogs/next.md