Merge pull request #9275 from nupplaphil/task/9235-issue_template