Merge branch 'cs/#7048-zend-code-psr2-compliance'

Close #7048