Fix regression
Merge branch '2.1'
Merge branch 'sonata/master'