Port to 5.1.1 (accomodate P8 4.5 + P8 5.x)