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