case 2589 - Author name is not truncated.
case 2589 - CR fix.
Merge branch 'case-2589' into develop