refs #7565 attachment panel in activity
Merge branch 'dev' into test