Pim 2747

| Q                    | A
| -------------------- | ---
| Bug fix?             | No
| New feature?         | No
| BC breaks?           | No
| CI currently passes? | ?
| Tests pass?          | Yes
| Scenarios pass?      | ?
| Checkstyle issues?   | No
| Changelog updated?   | No
| Fixed tickets        | No
| Doc PR               | No
Can be removed