re #861 - Template filter is not working
Merge branch 'feature/861-attachments' into staging