Merge branch 'release/2.6.1' into dev
.php_cs add file for php-cs-fixer configuration
cs fixes
.php_cs - simplify