I've sent a v3 now that fixes some conflicts and should apply once more upon master.