Merge origin/master into skuska
Conflicts: composer.lock config/packages/security.yaml src/Controller/Admin/DashboardController.php symfony.lock
Conflicts: composer.lock config/packages/security.yaml src/Controller/Admin/DashboardController.php symfony.lock