Merge branch 'fix/empty-attachment-statuses' into 'develop'