Not really related to this PR. Could you open a separate PR please?