Indeed yes.  Do you want to kick in a merge request for that?