updated to sonata 2.2.x