12 Commits (nc-feat/attachment-clean-up)