Merge remote-tracking branch 'origin/master' into 26-upgrade-core-common-dependency

Conflicts:
	NOTICE
1 job for !91 with 26-upgrade-core-common-dependency in 2 minutes and 17 seconds (queued for 6 seconds)
latest merge request