If it is difficult for you to do it now, please make a ticket to do it later, and I will merge this pull-req.