Merge branch 'sonata/master' (reverted from commit 84b72ac3c1519eed037dbb384ec4341e29e3a7b0)