One way or another I think we shouldn't block merging this patch. I'm happy to remove that setting once we hear from @dragos.