(cherry picked from commit f7b6c1907c326a1befd8b5c8a1d311d551e8670f)
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)