What does this MR do? Checklist Basic functionality is unchanged Tests are unchanged (assert line) Conforms to the code review guidelines Related issues