Make sure the siteId is passed
Merge branch 'sonata/master'