re #902 - Avoid mentioning the file extension two times
Merge branch 'feature/902-attachments' into staging