fixup FORGE-1668: Support UIXXMany components