(cherry picked from commit 14ec1cf1cb)
14ec1cf1cb
(cherry picked from commit 08ebf86d37)
08ebf86d37
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbd)
48e6a75fbd