Merge branch 'sonata_bundle' into dev-master