Merge branch 'feature/bug-report-template-tweaks'