Merge sonata 'Improve short description preview'
Merge with master