Is this something you still plan to address in this PR?