Force block bundle version
update code to use BlockContext
Update composer.json
Merge branch 'sonata/master'