Merge pull request #6149 in master
Fix: Fix PHP-CS-Fixer to a working version
Merge pull request #6180
Merge pull request #6180 in develop