Merge branch 'hotfix/identifiers'
CS fixes

- per php-cs-fixer
Merge branch 'hotfix/cs' into develop