Merge remote-tracking branch 'origin/develop' into feature/4517-from-dev

# Conflicts:
#	CONTRIBUTING.md
#	composer.lock
#	core/designdocument.class.inc.php
#	lib/composer/installed.json
#	lib/composer/installed.php

setup/wizardsteps.class.inc.php

@@ -681,6 +681,11 @@ class WizStepLicense extends WizardStep
 		return array('class' => 'WizStepDBParams', 'state' => '');
 	}
 
+	/**
+	 * @return bool
+	 * @throws \Exception
+	 * @since 2.7.7 3.0.2 3.1.0
+	 */
 	private function NeedsRgpdConsent()
 	{
 		$sMode = $this->oWizard->GetParameter('install_mode');