Updated variant 2 + 3 to P4L v2.34