Merge branch 'feature/JAL-3468featureDescriptionEllipsis' into develop