updates from sonata project
Merge branch 'origin/2.3.1'