Commented out template changes for now
Merge remote-tracking branch 'origin/feature/show-hide-body' into staging