Fixing phpcs ignore rules
Merge develop into issue-668