I didn't have a time this week to do it. If someone want to do it at least for master branch I will be happy to help with review and merge.