BAM! (cherry picked from commit d0dca8a885) (cherry picked from commit 0502955a2a)
d0dca8a885
0502955a2a
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbd)
48e6a75fbd