### Prerequisites - [X] I have written a descriptive issue title - [X] I have searched existing issues to ensure the issue has not already been raised ### Issue Coverage should be 100% Follow-up to #1157
