Shouldn't be part of this PR? In my opinion it's up for debate in a separate ticket?