@polvi yes - that's exactly what this patch is for