Merge remote-tracking branch 'origin/release/0.13' into cherry-pick-log4j-2.17.1

Conflicts:
	NOTICE
3 jobs for !227 with cherry-pick-log4j-2.17.1 in 35 seconds (queued for 4 seconds)
latest merge request