Hello and sorry for the late reply,

I've justed submitted #10412 that should make this change doable and your PR mergeable