Merge pull request #17132 from apache/feat/pie-coordinate-system