This PR should focus on a single topic of discussion, despite a ticket which may have multiple topics.

If this change is not directly used by this PR then it would be better in a new PR with a different ticket (which mentions the direct topic of discussion). And it will still need JavaDocs :P