<!-- To raise a new Pull Request, the following prerequisites need to be met. Please tick before proceeding: -->

- [ ] a GitHub Issue was opened for this feature / bug.
- [ ] test coverage was added (Cucumber or Spock as appropriate).

Fixes #XXX