@pveentjer can you have a look and merge that PR?