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