HH-32313 change attr for short message
Merge remote branch 'origin/HH-32313' into release-candidate
release 1.0+hh3