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

Conflicts:
	NOTICE
2 jobs for !226 with 78-upgrade-core-common-dependency in 43 minutes and 20 seconds (queued for 4 seconds)
latest merge request