Shouldn't this be in a ticket somewhere, rather than in a comment here? Perhaps in the description of this PR, with a request to create a new ticket to address them when this is merged?