I suggest adding it as a TODO & making an issue. But don't think it need to be done in this pull-request. But should be done in a followup. :)