Fix: Add missing throws tags
Fix: Fix PHP-CS-Fixer to a working version
Merge pull request #6180
Merge pull request #6180 in master
Merge pull request #6164
Merge pull request #6164 in master
Enhancement: Do not overwrite requestId if extra already has one