Combine branches

[Jday7879]

Summary

Add your summary here - keep it brief, to the point, and in plain English. For further
information about pull requests, check out the GDS
Way.

Checklists

This pull/merge request meets the following requirements:

• code runs
• developments are ethical and secure
• you have made proportionate checks that the code works correctly
• you have tested the build of the template
• test suite passes
• minimum usable documentation written in the docs folder
• changelog has been updated

Comments have been added below around the incomplete checks.