Exclude attachment refs that err
Merge branch 'fix/exclude-erroring-attachmentrefs'

* fix/exclude-erroring-attachmentrefs:
  Exclude attachment refs that err
Fix a bug where a template "endif" was removed
Merge branch 'fix-session'

* fix-session:
  Fix a bug where a template "endif" was removed