BAP-6088: Academic project on Symfony standard
- Fixes for CR round 2