Merge branch 1.19-ppmac