#25035 progress fix
#25035 support other display of attachments
Merge branch 'master' into development