Comply with CodeSniffer standards
Merge branch 'develop'