Merge "P requires 4.14.42" into pi-dev