I suggest you already submit it as a separate PR which can be merged quickly