Fix regression with namespace
Merge branch 'sonata-project/master'