Attempting to fix code sniffer errors for avatar service
Merge branch 'feature/avatar-service' into development