Fixes to maintain compatibility, fix to Symfony Service Provider
fixed merge conflict