(cherry picked from commit 5bee1585a3)
5bee1585a3
(cherry picked from commit a585c94fed)
a585c94fed
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbd)
48e6a75fbd