I create an issue for this (it's not dependant on this work)