Testing attachment updating for a related bug
Merge branch 'features/testing-attachment-updating'