Merge sonata 'Improve short description preview'